projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe2ef45 bc05bbc)
bitkeeper revision 1.1159.183.47 (41b88be2G5Z3etJanoh9c3CpkN8jSg)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 9 Dec 2004 17:31:14 +0000 (17:31 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 9 Dec 2004 17:31:14 +0000 (17:31 +0000)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
Unnamed repository; edit this file 'description' to name the repository.